Merge "Avoid double quiet mode requests" into udc-dev