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