Merge "Backport Prevent shortcut info package name spoofing" into oc-dev