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

Change-Id: I0798609f3741e36ce755cd7215560b2e313b3632