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