Merge "Fixes NPE when calling getPackage on a null shortcut"