Navigation bar custom height

Conflicts:
	res/values/custom_strings.xml