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

Conflicts:
	AndroidManifest.xml