Merge "Disable auto connect while DPP session in progress" into udc-dev