Merge "Revert "Revert "Use new onStartSplitLegacy when starting split f..."" into tm-dev