Merge "Remove unsupported per-app locales after the LocaleConfig override" into udc-dev