Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev