Merge "Block onWwanSelected until setEmergencyMode completes" into main