dropdown hide/show: only show when we have something to show.
Merge branch '_dev/hide-dropdown-when-no-choices' into dev
Merge branch 'dev'
Merge branch 'master' into dev