am 93492d1a: am c748832f: Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev

* commit '93492d1a478770783abab764855c8d47e0264f71':
  Revert overdraw avoidance visualization change