Merge "Display "Sign into network" in settings when on a captive portal." into nyc-mr2-dev