Merge "Use the LayoutManager as the source of truth for visible positions" into sc-dev