Merge "Merge "Fix set_buffers_damage in VulkanSurface" into qt-dev am: 8d8d704cf7" into qt-dev-plus-aosp