Merge "Clean up ANGLE integration logic." into main