Merge changes I0e4cedbf,Idfa1b82c into sc-dev

* changes:
  Add instanceId to LAUNCHER_FOLDER_CONVERTED_TO_ICON log event.
  Fixes wrong container for LAUNCHER_ITEM_DROP_COMPLETED log event.