Merge "Merge damage region when dropping an app buffer" into qt-r1-dev