Merge "Migrate buffers during surface change" into qt-dev