am e00ab550: am ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev

* commit 'e00ab550d2ab3fc539cf02a45f774c9bf68e585a':
  Prevent lockscreen album art from flickering on metadata change.