Merge "Modify logging to log the specifc grid size when taking a snapshot" into main