Merge "Clean up ANGLE integration logic." into udc-qpr-dev