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

Change-Id: I5685e1d7b4747a5e0276158f11de355131fc4dea