Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev