Merge "Revert "gpuDrawTime should default to 0 when endTime is unknown""