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

Change-Id: I5ee0a2dbbb36e66822f4539f6b186df23a7438da