Merge "Various LocaleList cleanups"