1. Device sync fixes
2. Fix services
Merge remote-tracking branch 'origin/bleeding-edge-react' into bleeding-edge-react