Merge "Only add system language on locale page" into tm-dev