Merge "Text selection handles correctly scroll"