Backport Bugzilla 1922294: RFP: fixup square spoofed orientation

Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1922204

Second-part of #30543 (closed)