4339-Update_with_upstream_v3.7.1
Description
Cherry-pick our changes over the latest upstream release v3.7.1
Screenshots
Technical details
Cherry-pick our changes, and fix build issues. But /e/OS Notes is not ready to be targeted to the main branch yet, as auth flow is not ready yet (see: https://gitlab.e.foundation/e/backlog/-/issues/6411)