Merge "Track LocaleManager API changes" into studio-1.1-dev