Merge "Fixes the collapsed view with images and different densities" into pi-dev