Merge "Use an isolated token to represent shell transitions" into tm-qpr-dev