Merge commit '360fde8eabdc9c45d1b52e350ccfb4bac9d93107' * commit '360fde8eabdc9c45d1b52e350ccfb4bac9d93107': Fix preference caching to increase recycling of preference views.
Merge commit '360fde8eabdc9c45d1b52e350ccfb4bac9d93107' * commit '360fde8eabdc9c45d1b52e350ccfb4bac9d93107': Fix preference caching to increase recycling of preference views.