Merge "Remove dependency of EmergencyCallbackModeExitDialog"