Merge "Revert "Prevents an NPE when content provider is slow to start""