Merge "Fix clock preview when changin clock size" into udc-dev