Merge "DO NOT MERGE Revert "Verify URI permissions for notification shortcutIcon."" into rvc-dev