am b7ee3b51: Merge "BrowserSettings required a Controller sometimes"

* commit 'b7ee3b51919842cd26eb865d28cd9ce8e3ba5a2e':
  BrowserSettings required a Controller sometimes