Merge "Ensure first load for bitmap and nine-patch gets correct density" into mnc-dev