Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev