Separate Oct Settings into it's own menu...
...and return Development Options to it's original state. Add power menu icons, oct settings icon, development options icons, move advanced settings and all device extras for customizing into Oct Settings.
Navigation bar buttons customization(1/2)

Navigation bar buttons customization: lock current orientation in edit mode
Freeze current orientation during edit mode.

Conflicts:
	res/values/ras_strings.xml
	res/xml/system_settings.xml

Conflicts:
	res/xml/oct_settings.xml

Conflicts:
	res/xml/oct_settings.xml
Navigation bar custom height(2/2)

Conflicts:
	res/values/ras_arrays.xml
	res/values/ras_strings.xml