Merge "Animate clock after unlocking" into pi-dev am: 23ac9ac522
am: 01ba5a0003

Change-Id: Ia282ec8c81306ed7511850ec630b6a3781c6c999