Bug 40241 v5: Update components for mozilla87-based Fenix

Closes #40241 (closed), #40172 (closed).

This is the same as !238 (closed) with the following changes:

• 0b452785 has been squashed
• the commits order has been changed, following !236 (comment 2728968)

Unless there are new review comments, I think this is ready to merge.