Merge "Additional tracing for volume dialog" into udc-dev