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

Change-Id: I1010302a381b6bb6712ca552a7595416b1b67fb9