Merge "cleanup misleading logs around restore and grid migration" into main