[edit controller] Fix composite entity reparenting when inlined
This implies handling the reparenting case sooner, otherwise the
child entity modifications are cancelled (see 113e9da47afc).
Add a new test to ensure non-regression in all previous tests.
Closes #10291977.
