am be9560db: Tidy up the website settings activity. This is mostly a cosmetic change. The only functional changes are to: 1) Not dismiss the site specific settings screen when a feature is removed if that site still has more features in use, and 2) Not use the title o

Merge commit 'be9560dbeb44338070170816b1ca45b2125b7ad9' into eclair-mr2-plus-aosp

* commit 'be9560dbeb44338070170816b1ca45b2125b7ad9':
  Tidy up the website settings activity. This is mostly a cosmetic change. The only functional changes are to: