Merge "ShortcutPreference Toggle design." into rvc-dev