Merge "boot: Relax getSnapshotMergeStatus test." into rvc-dev