Merge "Fix overdraw" into lmp-dev