Merge "Fix BrowserSettings to apply blockPopupWindows() correctly"