Merge "Log source component instead of current task base intent" into ub-launcher3-edmonton