Merge "Ensure at most one pip-dismiss-overlay" into sc-v2-dev