Reordered the toggles list into groups of similar items

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