690- update to upstream v6.307

Description

This MR fixes merge conflict when updating to v6.307

Issue(s)

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

Test environment

Download apk from the pipeline

Test procedures

Test all basic functionality working 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