Merge "Enable DOM storage API for CaptivePortalLoginActivity"