Merge "Don't reset translation callback with other state" into tm-qpr-dev