Merge "Fix subtle bug in disableHardwareVsync" into udc-dev