am 697ace4e: am e2ff1a4e: Merge "Fix overdraw" into lmp-dev

* commit '697ace4edd1f1bf28dd0c058f53ad7af5858f2c8':
  Fix overdraw