Merge "Fixing a monkey crash in the BrowserSettings"