Merge "Pass userId through to singleton ContentProviders"