Merge "Always cancel clock animation" into pi-dev