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

Change-Id: I41c965f920911cac9d858f88fcc59b7b78fdef53