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

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