Merge "New Settings symbols for captive portal detection" into nyc-mr1-dev