Merge "Synchronize the execution of exitEmergencyMode and setEmergencyMode" into 24D1-dev