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

Change-Id: I56da8ee62981a8b537b65a8d20f558eb672e8613