Merge "Show empty options in shortcut chooser dialog if shortPreference is unchecked." into rvc-dev