Merge "Prettify the captive portal sign-in activity" into oc-dev am: 8bc542695c
am: 9b0e9c87ed

Change-Id: I4a40f12d804a4cab02c48b024570b3ca060b4248