Move draw by material check

It is more natural to test this case among
others material distributions.

No functional change.
Fix some comments in position.cpp

No functional change.
Merge remote-tracking branch 'upstream/master'