Merge changes from topic "overlay-vis-remerge"

* changes:
  Move MockitoUtils to server om package
  Revert "Revert "Overlay, actor, and target app visibility handling""