Merge "Increase auto-recenter rotation threshold to 10.5 deg" into tm-dev