Merge change Ib5077943 into eclair-mr2

* changes:
  Fix NPE when APPWIDGET_PICK has no value for EXTRA_CUSTOM_INFO