Merge "Always set the dataDir for the given userId"