Merge "Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am: 6f87503ed8" into oc-dr1-dev