am 790a604b: Merge change 6372 into donut

Merge commit '790a604b9c32647711599710e21f0f00eb3d839c'

* commit '790a604b9c32647711599710e21f0f00eb3d839c':
  Fixes #1963217. Increases the invalidate region in compatibility mode.