44edb50b18f5cd1a78aae32384551c74e6c19304 removed filtering
of annotations when there was a selection alongside other changes.

This re-introduces the check to see whether there is a
selection and if so whether an annotation is in the selected
set when determining whether to show a thread.

Fixes #2553