Merge "Revert "Revert "Remove check for preventing re-parenting non-spl..."" into tm-dev