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

Change-Id: I3c951fd2572abbada566494b5954697be098865d