Merge "Filter the locale not in resources" into tm-dev