Merge "Remove redundant connect methods in Surface." into main