Improved interaction between point and polygon highlights and blocked display of empty popup
Merge branch 'revise_popup_template_for_empties' into develop