Merge "Ringtone picker to handle RESULT_CANCELED from Add ringtone" into main