Merge "Fix indicator not removing in certain cases" into tm-dev