Merge commit '4.4.1_r1' into HEAD

(cherry picked from commit 826b1378a5a706c5d2148f803f407ac8cd8e4e0f)

Conflicts:
	res/values-en-rGB/strings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/SecuritySettings.java