Merge "Only send storage intents after boot complete"