Merge "Fix EmergencyCallback in NetworkController" into mnc-dev