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