Merge "Fix race condition when setting default ringtones"