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

Change-Id: Ie21ecbb8f1ff203bf80def7585b67d1e0baa6c1e