Merge "Set default grid when doing a backup and restore" into main