Merge "Reset translation state when views disappear." into tm-dev