[AVSwitch] fix issues with aspect ratio. (reverse-merged from commit b7ddf78b150c2ecf284798d04ba261d8aa750c78)
Reversed as a provisional bugfix.