Merge "Fix for wrong ringtone when using VoWiFi"