Merge "Indices correction inside RecentsView" into main