Merge "Only updateBoundsSurface when surface size has changed." into qt-dev