Merge change 8986

* changes:
  Generalizes WebsiteSettingsActivity to handle more than just database permissions.