Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3a059026bc
Change-Id: I6b9b3f0705d0f479da006ecca58f12b086c60310
This commit is contained in: