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

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