That's where I think we're headed. Just looking at Apple's product line alone for simplicity, take a look at how much the new iMac looks like an iPad on a stand:
From the iPod Nano to iPhone 4S to iPhone 5 to iPad Mini to iPad to 11" Air to 13" Air to 21" iMac to 27" iMac, doesn't it seem like we're headed to a world where a computer is a thin display panel of arbitrary size with some electronics hidden behind it? And it won't make sense to think of them all as fundamentally different products any more than we think of, say, small pads of paper and large pads of paper as fundamentally different products.
I was freaked out the first time I saw that iMac photo, but as it turns out the angle at which it was taken is...highly optimized.
The difference between the Apple product line and the (Android) phone marketplace is that Apple hasn't stopped making the iPod Nano, likewise the paper industry didn't stop making small pads of paper when Trapper Keepers became more popular.
