Merge "Clean up SplitData refactor flag" into udc-qpr-dev