Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev