Merge "A bunch of updates to BrowserProvider2."