Merge "SurfaceControl#setGeometry: Pass invalid rect instead of empty rect" into qt-dev