Fixes to make ImportInitialScreenViewTest run