Merge "Dismiss bouncer properly on SHADE_LOCKED" into qt-r1-dev
am: 6b068a4f65

Change-Id: I2c50382e3ad82868715bba9ec9659962c39e6b96