Merge "ViewRootImpl: Guard against null in performMeasure" into oc-dev