Promote latest dev changes to master.

Includes:
1. Faster shutdown
2. Safer opt-out/in concurrency
3. Removal of suspend/resume events
4. Hold network queue when internet not detected