Merge "Revert "Set Visibility on ClockSwitch Animation"" into tm-qpr-dev