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

Change-Id: Icb10b8e53a113796ed8eccb7d3a61a473643bc96