Merge "Fix Visualizer and Volume type UUID" into udc-dev