Merge "Fix NPE when config is updated before ViewRootImpl is set"