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

Change-Id: I6be42b4ffd81b1170a8307c4cb3b6bfa3208c505