Merge "Fix NPE on rootViewImpl.getView" into main