am a7e1d8d5: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen

* commit 'a7e1d8d5f7d16cd1004189f9aee727962790b8bf':