690-Update to upstream v6.305

Description

This MR resolves the merge conflict introduced when trying to update to upstream v6.304 & v6.305

Issue(s)

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

Test environment

Download apk from the pipeline

Test procedures

Test basic functionality if it works or not

Technical details

Screenshots

Checklist

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