Merge "Revert "Add 2 ANGLE deferlist settings"" into udc-dev