Merge "Remove scaling from spring loaded y translation." into tm-qpr-dev