Merge "Make AppCompatImageView.setImageResource(0) work" into mnc-ub-dev