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

Change-Id: I05383df0eb55c2c51986a408b91bbb602eab363a