Merge "Protect all calls to mShortcutHelper with null check" into rvc-dev am: 754636846c am: 1c0cc0feae am: f7d1a4bafc

Change-Id: I5a45a231fc7843fd399a1e660cd8bfaf1eac81bc