115-Q-fix_merge_conflict_for_automatic_update
Description
Automatic update with upstream failed because of merge conflict. This MR fix those merge conflict issues & resolve UI issues introduced by the merge.
Issue(s)
Test environment
Pipeline build against 115-Q-fix_merge_conflict_for_automatic_update FEATURE_BRANCH & v1-q BRANCH_NAME
Test procedures
Open music app, navigate to music app, check everything works as expected.
Technical details
Screenshots
| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
Check list
-
Self review -
Test procedure explained -
Tested on fresh install -
Tested applied as an update -
License -
Internal documentation -
User documentation