Merge "Fix spring not springing when unstashing." into tm-qpr-dev