Merge changes from topic "UpstreamAngleSwitch"

* changes:
  Add 2 ANGLE deferlist settings
  Can switch to legacy GLES driver when ANGLE is system driver