Merge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev