Merge "Remove setFrame from surface_control setGeometry" into sc-dev