[core] Fixed group lock-order-inversion (#3013).

[core] Fixed group lock-order-inversion (#3013). #3558