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