Merge "Simplifying code around multiple translation components" into tm-qpr-dev