Merge "Improve javadoc on getDefaultLocale()" into main