Navigation bar custom height

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

Conflicts:
	res/values/simpleaosp_strings.xml

Conflicts:
	res/values/simpleaosp_arrays.xml
	res/values/simpleaosp_strings.xml
	res/xml/display_settings.xml

Conflicts:
	res/xml/display_settings.xml