Uber Planning to Combine Food-Delivery, Ride-Hailing Into a Single App