CMS-3863 TextComponent - Fix TextComponentView
First commit - unfinished. Leaving remaining for asignee of task