Merge "Create User Preference Setting for Alarm+Ringer Mode Association" into main