Merge "ViewRoot: More surgically fix child-life time." into oc-dev