Merge "snapshotctl: merge when boot"