Merge "Protect all calls to mShortcutHelper with null check" into rvc-dev