Merge "Stop doing unparent and reset in text decorator." into devel/master