Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev