Merge "[Unfold transition] Increase spring stiffness" into tm-qpr-dev