Merge "Fix NPE in Stepped Clock Animation" into tm-qpr-dev