Merge remote-tracking branch 'settings/kitkat-remix' into kitkat-remix-test

Conflicts:
	res/values/pa_strings.xml