Merge "Revert^2 "Stylus Metrics: Switch to non-bootstrap statslog library"" into main