Revert "Fix occasionally flickering music control widget."

This reverts commit cb312eb1fb1b6f3a7dda75eef4ea8c6ecaa242d7.
Prefer artist over album artist.

E.g. when playing a compilation title, one very likely wants to see the real
artist instead of 'Various artists'.

Change-Id: Ie200f2f8b0b90d3470c2e2e4ca6f91f9b117fb1f