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

Change-Id: I40fcbbddacaa6bff7f3fb6e4bd62192443ab7676