Merge "Removing custom activity dump logic" into ub-launcher3-master