Merge changes from topic "am-a343453321d44979adac9c26fc738eab" into udc-qpr-dev

* changes:
  [automerger skipped] Merge "Resolve custom printer icon boundary exploit." into tm-dev am: 437207f5 -s ours am: 3b782ec1 -s ours am: a4fdb271 -s ours am: be1c91eb -s ours am: 4698fb77 -s ours
  [automerger skipped] Resolve custom printer icon boundary exploit. am: 39f57376 -s ours am: 28003667 -s ours am: 6e7c1338 -s ours am: b5e31e46 -s ours am: 137217f1 -s ours