Merge "Only set an ImageView's image if we know the resource" into mnc-ub-dev