Merge "Move device connection logic to a separated class" into main