Merge "Update protolog stacktrace trim amount" into main