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

Change-Id: I0a10b84a6099f5dfde36ab16b7f9117ca38827b0