Merge "Reposition the text's popup when the text is scrolled." into devel/master