Merge "Remove GLTrace support"