Merge "Fixes the collapsed view with images and different densities" into pi-dev am: 061d858828
am: 04655bca5b

Change-Id: I321e2028e31a5314a09d11be9dc35e42af23c962