Merge "Remove unused Udfps overlay" into udc-qpr-dev