Settings: Rearrange settings menu to get a more logical structure

Change-Id: I012ef2135fe78807e167b94303c9fbd7220d6317
Merge "Settings: Rearrange settings menu to get a more logical structure" into kitkat