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

Change-Id: I7f8e92cdaa33146315fd527cdcc8695fddfdf276