Merge "Correctly report isOpaque() from ImageView"