Resolved conflicts, Small Cleanup in CCore::OnDeviceRender