Merge "Add Text's popup overshoot property." into devel/master