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

* commit 'dcc746ea793621b7d0bf4a3f3e66bd969e74fe64':
  Avoid NPE when rotating after deleting timer