Merge "Fix the "Alarm volume" icon is displayed incorrectly"