Merge change 22795 into eclair

* changes:
  The Gservices settings for pruning messages/chats.