Merge change 24014 into eclair

* changes:
  Gservices settings for controlling URL scraping in GTalk app.