Stable v0.99.2: swap stability fixes

This is just @pserwylo's !232 (merged) on top of 0.99.1. I found a couple other devices, and it improved things there, so I'd like to do a stable version bump so we can have less pressure to release the DownloaderService changes before they are ready.