Merge "[pm] fix Settings crash due to null dataDir" into main