Merge "Add connection service focus manager"