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