536-Update_to_upstream_v_6.201

Description

This MR resolves the conflicts introduced when updating with upstream update (v6.201).

Issue(s)

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

Test environment

Download apk from pipeline & install in your device

Test procedures

Run basic functionality (account login, send & receive mail, encryption etc) in the /e/OS Mail app & check everything working as expected.

Technical details

Screenshots

Check list

• Self review
• Test procedure explained
• Tested on fresh install
• Tested applied as an update
• License
• Internal documentation
• User documentation