Merge "Update the visibility of album art correctly" into pi-car-dev