944-update_with_upstream

Description

Fix merge conflict on merging with upstream & update to upstream v4.2.6-ose

Screenshots

Technical details

Tests

Check basic operation (account login/logout, account sync etc) works perfectly or not

Issues

• https://gitlab.e.foundation/e/os/backlog/-/issues/944

10 commandments of code reviews

👪 ❤ https://gitlab.e.foundation/internal/wiki/-/wikis/development/code-review