Merge "Revert "Ensure keyboard is hidden when bouncer is..."" into tm-qpr-dev