Merge "Show bouncer when unlocking and not interactive" into qt-r1-dev am: 1905fb1468 am: 0488e681d8
am: b0c55fc214

Change-Id: Iff51b542cbf8a45e4d311eba10bea77c6f590099