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