Merge "Popup windows positions are updated when a TextView is scrolled"