t push# This is a combination of 3 commits.
Bug 848378 - Implement alarm view and edit.