Merge "[Cherry-pick] Avoid unloading ANGLE." into main