Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev