Merge "Removing unnecessary check of shortcut infos (now that we key removals off package names already). (Bug 6755420)"