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