Merge "Fix conditions for popup window transition CTS test" into nyc-dev