Unity: Move Cg WIP fix into Unity directory