[Backport 2.x] Ensure consistency of system flag on IndexMetadata after diff is applied (#16644)

[Backport 2.x] Ensure consistency of system flag on IndexMetadata after diff is applied (#16644) #9214