Merge "gpu: ion: fix locking issues in debug code"