Navigation bar custom height(2/2)

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