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

Change-Id: I0b961e13c0db6bc43dd2b577c68cbefe97de3363