Merge "Do not re-position the text popup when the text scrolls." into devel/master