Merge change 22080 into eclair

* changes:
  Fixes a bug in the browser settings menu. Correctly hooks up 'Clear location access'.