Merge "Don't invalidate sim data when indexing by slot id" into main