Merge "Ensure text doesnt jump during enrollment" into tm-qpr-dev