Merge "Fix amnesia problem in MultiSelectListPreference." into jb-dev