Merge "Use the new onDraw method." into lmp-docs