Merge "RingtoneManager: allow video ringtone URI" into sc-dev