Merge "[automerger skipped] Merge "Validate URI-based shortcut icon at...

Merge "[automerger skipped] Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c am: bf3e2fd9 am: 37fbb483 am: ac61b7d0 am: f9a2bcf2 am: 6824374b am: e81ac136 am: 69d83198 -s ours am: 03e7be40 -s ours am: 1ebfab80 -s ours am: 6e2b7f63 -s ours am: a6496aa3 -s ours" into main