Merge "Gradle update" into ub-launcher3-master