Merge "Revert^2 "Make adbconnection start automatically for debuggable apps (on target)""