Fix detection of clicking on background grids.
Merge branch 'develop'