Merge "Alarm icon is not shown for secondary users"