Merge "Delay DropBox until SettingsProvider becomes ready" into pi-dev
am: 5e61df7a8e

Change-Id: Ic87e82cf9c02e7c42313221613ad793b56f9da7e