Merge "Move OverlayHostTests back to general-tests" into rvc-dev