Merge "When dropping a frame, merge its damage region" into qt-r1-dev