Merge "Delay DropBox until SettingsProvider becomes ready" into pi-dev