Merge "Fix out-of-sync updates during grid change" into main