Merge "Fix potential NPE in EmergencyCallbackModeExitDialog." into oc-dev