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

Change-Id: Id655667e19c2ddc65a3d3deb6a447850ec02e90c