Merge changes I5c00b252,Ib401f64e into main

* changes:
  Fix custom ringtone restore in Notification channels.
  Implemement the media lookup for ringtone restore in SettingsProvider.