Merge "Fix preview cut on clock settings page" into udc-dev