Patch Set 2: Looks good to me, approved; IP review completed

Looks good, thanks for the catch.

UI tests in general have to becareful when it comes to making assumptions on button order for OK/Cancel. The other buttons should be fine.