Merge "No cell data should re-enable wifi" into sc-dev