Merge "Show bouncer when unlocking and not interactive" into qt-r1-dev