Merge "Hide alarm condition if there's no alarm." into nyc-dev