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

Change-Id: I0c3083bd7d187f6917299733299ba0378c984bb6