Merge "Set launch source target correctly for user event logging" into ub-launcher3-calgary-polish
am: be37dcb1b1

Change-Id: Iabb9c5711b549f2271a8edd8ec16bdf638891a10