Merge "Add preference for Connection Service selection"