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

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