UIModes and system DPI

Change-Id: I3b6aa829130ba072899ac1728b0759146b141367

Conflicts:
	res/values/arrays.xml
	src/com/android/settings/carbon/HybridSettings.java