Insert location only if not outside map paint area
Merge remote-tracking branch 'origin/master'
increased log level for discarded events to debug