Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev