Merge "CaptivePortal: login activity UI improvements"