Merge "Prettify the captive portal sign-in activity" into oc-dev