Merge "Text Renderer - Fix the actor hierarchy." into devel/master