Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev