Merge commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635' * commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635': Minor SharedPreference clean-up.
Merge commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635' * commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635': Minor SharedPreference clean-up.