Merge "gpuservice: prevent hang in destruction" into main