Merge "Preventing component spoofing during getShortcutIntent" into sc-dev