Merge "Introduce a flag to enable shell caption" into tm-dev