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

* commit 'e2ff1a4edbe5c8eeb2610a62b8cfe7a58d4c8150':
  Fix overdraw