Merge "Cleanup ENABLE_DOCK_SETUP_V2 flag" into udc-dev