Merge "Alarms created from external intents use default ringtone" into ub-deskclock-charm