Merge remote-tracking branch 'origin/redesignOnboarding' into redesignOnboarding

# Conflicts:
#	build.gradle

build.gradle

@@ -10,6 +10,7 @@ buildscript {
     }
 
     dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.0-beta04'
         classpath 'com.android.tools.build:gradle:3.3.0-alpha03'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"