Merge "Revert "Remove check for preventing re-parenting non-split apps"" into tm-dev