Merge "Fix ExitPipWithDismissButtonTest with Shell transition"