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

Change-Id: I8685f019f33861bffb3b82ef0f494a80a8067d88