am 6ad5d69d: am 0a232673: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen

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