Merge "Fix NPE when mDataDir is null" into main