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

Conflicts:
	AndroidManifest.xml
Merge remote-tracking branch 'PA-settings/kitkat' into kitkat-remix
Settings: add better dialog handling for adb over network

thanks fusionjack for this

his fix was accidentally removed

Change-Id: Icc09585f719e743ba5bd8b830586f2ebc0018a71
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy