Merge "Fix issue where bouncer won't be dismissed when being dragged" into qt-r1-dev am: a95904e196
am: 127aeecbca

Change-Id: Ieab581acf07de20c8fbbdf3d4e633d6ca7b85da9