Merge "Avoid relying on undocumented behaviour in popup test." into marshmallow-cts-dev