Merge "Improve support for reparent operations in app transitions"