Fix blinking when picking is activated
Merge branch 'origin/dev'