Merge "Merge "ViewRootImpl: More null checks for performTraversals." into...
Merge "Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am: 6f87503e" into oc-dr1-dev
am: a870c653
Change-Id: Iea78aa8b8bd90c29d22f2a38dd424f0dd4eb1afd