Merge "Call persistToDisk after indexing VisibilityDoc" into sc-dev