Merge "Always cancel clock animation" into pi-dev
am: a1cb973366

Change-Id: I20406102b51c0dcbbd4a1fc122b89f98e2412607