Merge "Check if boxes still available when restoring state" into pi-dev