Settings: Fix possible NPE in Display settings

Change-Id: I186203782aa27fb4eaa77500fecb82946bfdd173

Conflicts:
	src/com/android/settings/DisplaySettings.java