Refs #7148. Fixing keyboard focus issue.
Merge branch 'feature/7148_splatterplot_pick_mode' into develop