Merge "Don't clear timestamps when enabling HW vsync." into udc-qpr-dev