Merge "Avoid unloading ANGLE." into udc-qpr-dev