Merge changes from topic "credential-removal-strings" into sc-dev

* changes:
  Update combined settings summary
  Update credential removal strings