Merge "Fix clock size in carousel is wrong in foldable" into udc-dev