Remove Extra Settings Category for now

This reverts commit 66337dd700852abeb8189e12dfce3999905bbe60.

Conflicts:
	res/values/mv_strings.xml
	res/xml/extra_settings.xml
Navigation Bar height: move to display settings