Merge "Fix imports in text related graphics classes"