Merge "Fix gpu resource not cleaned up" into main