Merge "Fixes NPE with system shortcuts." into rvc-dev