Wait for correct surface to disappear on transition

Waiting for the wrong surface makes the transition crash

Fixes: 227308870
Test: atest ExitPipViaExpandButtonClickTest
Change-Id: I3be2da3c344301586cc61201b962ffce3937e77d
1 file changed