Merge "ImageView updates cached drawable dimensions when drawable updates" into mnc-dev