Synthesized device names with OS and form factor look silly

[philbooth]

In #2041, I added the form factor to the synthesized device name to satisfy the outstanding request from #1889. However, having looked at it in detail while working on mozilla/fxa-content-server#5203, I think it looks a bit funny in some cases where we have both the OS and the form factor available:

Would it be better if we made the name have either OS or form factor, but not both. I mean:

@ryanfeeley thoughts?

[philbooth]

From meeting: second one is better.