Merge "Merge "Fix gpu resource not cleaned up" into main am: dab518a039 am: 8b07b22d9a am: ab6827934e" into main