Merge "Remove SurfaceControl.setPosition(int, int)"