Merge "Fix inconsistency in ringtone list"