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

Change-Id: Ia330f6ca633b2c5a60f7e1741ec03eba65b8f578