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

Change-Id: I855e9dcc604514322b2f817f03759ca2b6593fe8