Merge "Fix bug where the clock may not exist when using custom animation." into tm-qpr-dev