Merge "Mark ASurfaceControl.setGeometry as deprecated." into sc-dev