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

Change-Id: Ib88c5e9699d41a80d9cd39a193537f0683cad799