Merge "Fixing gradle version comflicts" into ub-launcher3-calgary