Merge "Resolve custom printer icon boundary exploit." into udc-qpr-dev