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

Change-Id: I5e7d57c946345f80ee7279c65d03ed33b2d9f99d