Generally, the controller does completely compensate (in hover, maneuvers can still be a little off) for a CG difference.
Never use the transmitter trims. Put them back exactly where they were during the transmitter wizard. If you can't do that then it is best to set the trims to center, and redo the transmitter wizard. After that, do the following to make it level (no drift) when hovering.
Change Configuration -> Attitude -> Settings -> RotateVirtual to make it motionless when hovering:
if it is drifting forward you subtract from pitch
if it is drifting left you subtract from roll
etc