(Re)move preferences:

Remove "Expanded desktop no navbar"

Move "Expanded desktop" and "Power menu" to:

Settings -> System -> General

Change-Id: I6c5904ac70de70a72d40c9e87e5b59bff0426dc6