Merge "Cleanup ENABLE_BULK_WORKSPACE_ICON_LOADING" into udc-dev