Merge commit '4.4.1_r1' into HEAD

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

Change-Id: I893218185177ce513ddc88edff7c2cfa4d97d54b