Merge "Fix a NPE in ViewRootImpl"