Fix a number or bugs wrt shroud/selection interaction in observer mode

Fixes #6421