Merge "Keep scrolling if visible view height too small" into tm-dev