Merge "CaptivePortal: login activity UI improvements" am: cb570ec50a
am: 95e0e08f61

Change-Id: I59a4d6daa591e577b6fd8e421c4f8fa5e26224d3