Merge "Fix a race condition in acquiring content provider" into sc-dev