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

Change-Id: I6c0562f256bed94ef74d427afd3bdc02ad53fb29