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

Change-Id: Ifebd0932e3ae847e741bf701d7834d13e58b3c6e