Merge "Prevent shortcut info package name spoofing"