Merge "Revert "Instrument captive portal login activity""