Merge "Adding LocalePicker support for the zz_ZZ pseudolocale" into jb-mr2-dev