Merge "Fix default clock moving up in picker preview" into udc-dev