Merge change 6372 into donut

* changes:
  Fixes #1963217. Increases the invalidate region in compatibility mode.