The follow-viewport-transform was missing from several calculations
3.x version of #59682
(cherry picked from commit 608cbd8296)
The follow-viewport-transform was missing from several calculations
3.x version of #59682
(cherry picked from commit 608cbd8296)