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

Change-Id: I77c6e2c062d9c6b73f976b74b6c6fd3b94f5ee4c