Merge "Refine alarm layouts" into ub-deskclock-fantasy