Merge "Enable cleartext for captive portal apps" into pi-dev