Merge "Restore work tile position after restore" into main