Merge "Move exclude layer to CaptureArgs." into udc-dev