Merge "[Bouncer] Add condition to keep keyboard hidden" into tm-dev