Merge "Drop fallback to deprecated locale.getdefaultlocale"