Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f
am: 43d72405b5
am: e358b7ab8c
am: 2c2c1b9540
Change-Id: I7acde12cd35cbbf2cf5a5d7a5e99c7ae17b600f7
This commit is contained in: