Merge "Enable launching captive portal directly" into pi-dev