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

Change-Id: I266d93892282ad8729a099557749bcd9b6f0431d