Merge "Fix inconsistency in ringtone list" into sc-dev