Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev