Merge "Implement smarter locale resource selection"