Merge "Avoid NPE when rotating after deleting timer" into ub-deskclock-dazzle