Merge "Unifying activity tracker callback" into ub-launcher3-master