564-Update_to_upstream_v6.300

Description

Fix merge conflict when update with upstream called

Issue(s)

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

Test environment

Build apk from pipeline

Test procedures

Test basic functionality, check if it works or not

Technical details

Screenshots

Check list

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