Merge "Fix issue 5064004, can't add shortcut to portal from AllApps"