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

* changes:
  [automerger skipped] Merge "Resolve custom printer icon boundary exploit." into tm-dev am: 437207f541 -s ours am: 3b782ec15c -s ours am: a4fdb27144 -s ours am: be1c91ebc2 -s ours am: 4698fb77e6 -s ours
  [automerger skipped] Resolve custom printer icon boundary exploit. am: 39f5737626 -s ours am: 28003667c0 -s ours am: 6e7c1338da -s ours am: b5e31e4620 -s ours am: 137217f1bc -s ours