Merge "Merge damage region when dropping an app buffer" into qt-r1-dev am: 6cabc2a4ed
am: abab133dbc

Change-Id: Ica6b49ef4054f53db7da492d4bc4005fa96c4e79