Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b am: 0571803b3e am: 69c1b703df am: e66f87a626
Change-Id: I0cba43f26f1ad9287295e8321efe4585deafaf37
This commit is contained in: