Merge "Fixing NPE when null intent passed to InstallShortcutReceiver. (Bug: 6089830)"