* commit 'bf378fd7d7a91085685fe9e5528b84c485041c77': Don't allow screen invalidations to go outside bounds of screen