Merge "Improved locale tracker logging"