Merge "Handle minor Alarm updates properly." into ub-deskclock-charm