do not start SyncService if synchronisation is disabled
Merge branch 'master' into ice-cream-sandwich