Merge "Disable Clock View Layer and ignore assigned alpha" into udc-dev