Merge "Disallow going back to initial empty page in captive portal app" into mnc-dev