Merge "Fix clock scale in picker" into udc-dev