Merge "Make sure settings tiles pick up locale changes" into nyc-dev