Merge changes Iae86dabb,I1db81304

* changes:
  Some small bug fixes in NUI.
  Log contact source when reporting spam from the new UI.