Reordered the toggles list into groups of similar items

Change-Id: I4eff495ced309b137b114b41b66125e98c0e98c7
Signed-off-by: Noah Greene <chevycam94@gmail.com>
Merge "Reordered the toggles list into groups of similar items" into jb42