Merge "Wait for cell network to connect before expecting a lost network." into sc-dev