Merge "Move Ringtones out of Advanced."