Merge "[CrashRecovery] Refactor SystemProperties as api" into main