Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b
am: 888ebb0dbb
am: 672ac07d29
am: 5075d425a3
am: f27afc8025
Change-Id: I4ed15caf8dd8f1df8f08bb3ea66ac3cebc9f82d6
This commit is contained in: