Merge "Avoid getting app locale config for each app" into tm-dev