115-pie-fix_merge_conflict_for_automatic_update

Description

Automatic update with upstream failed because of merge conflict. This MR fix those merge conflict issues.

Issue(s)

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

Test environment

Pipeline build against 115-pie-fix_merge_conflict_for_automatic_update FEATURE_BRANCH & v1-pie BRANCH_NAME

Test procedures

Open music app, navigate to music app, check everything works 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