Merge "Adding a locale picker with two-step selection: language, then region."