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

Conflicts:
	res/values-de/pa_strings.xml
	res/values/pa_strings.xml