Merge remote-tracking branch 'origin/4.12'

Conflicts:
	src/tools/qml2puppet/CMakeLists.txt

Change-Id: Id6243b0f725a68075d789bf35e771113b742645b

src/plugins/android/androidsdkmanagerwidget.cpp

@@ -444,6 +444,9 @@ void AndroidSdkManagerWidget::switchView(AndroidSdkManagerWidget::View view)
     else
         emit updatingSdk();
 
+    if (m_currentView == LicenseWorkflow)
+        emit licenseWorkflowStarted();
+
     m_ui->operationProgress->setValue(0);
     m_ui->viewStack->setCurrentWidget(m_currentView == PackageListing ?
                                           m_ui->packagesStack : m_ui->outputStack);