Merge "New Metrics constants for captive portal related UI"