Merge "Pip entry bounds incorrect upon rotation" into tm-qpr-dev