Merge "Update captive portal sign-in app SSL error page UI." into mnc-dev