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

Change-Id: If1b5ad18f2cc04de6a0fe6bdb73c79517036834f