Merge "Removing unnecessarily requiring activity to be a launcher" into ub-launcher3-master