Merge "Add methods to support verifying captive portal launch" into main