Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev