Merge pull request #12901 from pivanov/bug-917808

Bug 917808 - [Music] Generic album art overlaps hairline