Merge "[Bouncer] hide/show keyboard when focus is..." into tm-qpr-dev