Merge "Fix the text scroll when deleting text." into devel/master