Merge "Disable the shouldoverrideurlloading test for popup window"