Merge "Flag-guard an additional call to SBVM#hide." into main