Merge "Only updateBoundsSurface when surface size has changed." into qt-dev am: fd979ca3d2
am: 71df88b5b0

Change-Id: I4aabdc78505d5da7e20ffa3ea6257aa7b5c30dac