Merge "Cleanup ENABLE_SPLIT_FROM_WORKSPACE flag" into udc-qpr-dev