V4 dev backports and updates

Notes:

1. I can't seem to be able to find an Edge version older than 15 on BrowserStack, so I went with 15 which is the oldest one I see
2. The #30326 backport needs the test backported too. /CC @ysds for this