Merge "Fixing broken gradle build" into ub-launcher3-master