Merge change Ia98129b9 into eclair-mr2

* changes:
  Fix preference caching to increase recycling of preference views.