Merge "MBB: Handle Captive Portal networks" into sc-dev