Merge "Only updateBoundsSurface when surface size has changed." into qt-dev am: fd979ca3d2 am: 96af8617b0
am: d4262e4b95

Change-Id: Iea11db7e9fa50b428371a86055c4527f4ff1470d