Merge remote-tracking branch 'base/kitkat-remix' into remix-legacy

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/pa_strings.xml
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java