Merge "Do not reposition the text's popup when buttons are pressed." into devel/master