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