Merge "Update the visibility of album art correctly" into pi-car-dev am: 44d6bd4af0 am: 2850071b95 am: 4dcdef8809 am: 7b8c9b4199
am: 4a1d045710

Change-Id: Ie93d42109d4377a926ede54d2be474db93ba86a0