Move preferences:

Notification drawer ->
  Bars/Statusbar expanded
Notification drawer/Quick settings ->
  Bars/Statusbar expanded
Buttons/Navigation bar ->
  Bars
DisplayExpanded desktop ->
  More... (category Personalization)
Notification drawer/Heads up ->
  More... (category Personalization)

Change-Id: I05dda7808e50ce84003c10464f8ce1e2252cb55a