Thanks. From a tracking standpoint, it'd probably make sense to keep this bug focused on the targeted fix to land and uplift across all branches, then file a new bug for any trunk-only work you'd like to land.
Bug 2087301 Comment 13 Edit History
Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.
Thanks. From a tracking standpoint, it'd probably make sense to keep this bug focused on the targeted fix to land and uplift across all branches, then file a new bug for any trunk-only work you'd like to land afterwards.