Merge "Add traces for shortcuts, app targets and icons" into udc-dev