Merge "Hide keyboard when thumb scroller is visible." into tm-dev