Merge "Validate URI-based shortcut icon at creation time." into rvc-dev