am 66a7091f: 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 us

Merge commit '66a7091fad8778071b88896b6bae98f100e4bb60'

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