(Not sure why it worked without this when I tested the previous changes.) Untested, but should be fine. This is equivalent what is done on e.g. panscan changes. (cherry picked from commit 94a3a76ee3)
94a3a76ee3