Merge "Alarm content description now includes either existing label or "Alarm."" into ub-deskclock-dazzle