Merge "Move Ringtone creation onto the AsyncRingtonePlayer thread." into udc-dev