Merge "Refactor VisibilityStore's docs and maps to separate objects." into sc-dev