Merge "Animate clock after unlocking" into pi-dev