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