Merge "BrowserSettings required a Controller sometimes"