Merge "Fix clock too low in preview" into udc-dev