Merge "Revert "ViewRootImpl: Fix child lifetime."" into oc-dev