Desktop skips v1 train

This is pull #1031 with conflicts resolved for v1-train.

Raised as a pull because of its size.

`master` -> No!
`v1-train` -> Yes!