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

Change-Id: I034175a4f18992d3dd5e628f0793987a0a417935