Merge "Revert "Enable ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE for TEAMFOOD"" into udc-qpr-dev