Merge change I454a0dbf into eclair

* changes:
  SecuritySettings: revert "minor tuning".