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

Change-Id: Ib8d237cef192ae2f313e22d0d65eba1bb0cac805