Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev