Fix missing nav bar on tablets in landscape mode
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_apps_Settings into HEAD

Conflicts:
	res/values/cr_arrays.xml

Change-Id: Ia9593d6759bec5457a18f68d328804a6003d2dd6