Merge "Removing unused screen records" into udc-qpr-dev