[[ Bug 12765 ]] Use appropriate transform for window rect
Merge remote-tracking branch 'ian/bugfix-12765' into bugfix-12765
Merge branch 'bugfix-12765' into release-6.6.3