Merge "Revert^2 "Remove dependency on SystemProperties.set"" into main