Merge "Make scenario snapshot tests work with ephemeral|swap"