Merge "Don't clear translation state on temporary detachment." into tm-dev