Merge "[automerger skipped] Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c0f am: bf3e2fd99a am: 37fbb483b2 am: ac61b7d030 am: f9a2bcf245 am: 6824374b6b am: e81ac136a7 am: 69d83198e4 -s ours am: 03e7be403f -s ours am: 1ebfab808d -s ours am: 6e2b7f63cd -s ours am: a6496aa32e -s ours" into main