am e6c0bda5: Merge "Make points drawn with default paint visible" into lmp-mr1-dev

* commit 'e6c0bda5dd945f3668b4108c49ee52f1a04253d6':
  Make points drawn with default paint visible