Merge "Removing unused app discovery support" into ub-launcher3-master