Merge "Ignore dismiss requests if we're already going away." into main