Merge "Add a boot-snapshot-boot test"