Merge "Fix an issue with GPU stats not enabled"