Merge "Workarounding setup wizard non-disappearance only in presubmit" into main