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

Change-Id: Ibcd40516a6ddfcfc1651b8eb4b8f1ca37a2f27e8