Merge "Fix ringtone null pointer exception"