Merge "Update VisibilityStore to handle role-based system visibility." into sc-dev