Merge "Support properly setting and getting LocaleLists"