Sync DrawTargetCG with m-c