Merge "Adjust clock switch animation timing" into udc-dev