Adding the stoping of the visibility monitor if present.

Thanks a lot for the following up of the performance on this.