Merge "Remove preference category in zen mode alarms page" into tm-dev