Merge "Fix when updating the text's layout size." into devel/master