Merge "Removing dummy activity added for preview development" into ub-launcher3-master