Merge "Fix initial zoom with loadViewState"