am d3ddb2f7: am b35e8667: Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev

* commit 'd3ddb2f7d2486a481b1d800c1dc9712b19b412ab':
  Handle null argument in ImageView.setImageIcon()