Merge "Allow per-app opt in to use system ANGLE." into main