Merge "Fix query management in GpuProfiler" into oc-dev