Merge "Document the behavior of 'null' values in SharedPreferences" into jb-mr2-dev