Merge "Revert "Remove GLTrace support""