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