Merge "Remove AnimatableClockController in favor of ClockEventController" into tm-qpr-dev