Merge "ASurfaceControl: fix surface damage" into qt-dev