Merge branch 'release'

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/runner/webapp/webappconfig/slimui/WebAppSlimSettingPanel.java

@@ -322,6 +322,7 @@ protected void apply(@NotNull WebAppConfiguration configuration) {
     private void selectWebApp() {
         Object value = cbxWebApp.getSelectedItem();
         if (Comparing.equal(CREATE_NEW_WEBAPP, value) && !refreshingWebApp) {
+            cbxWebApp.setSelectedItem(null);
             createNewWebApp();
         } else if (value == null || value instanceof String) {
             return;

Utils/azuretools-core/src/com/microsoft/azuretools/telemetrywrapper/DefaultOperation.java

@@ -59,7 +59,7 @@ public void logEvent(EventType eventType, Map<String, String> properties, Map<St
             mutableProps.put(OPERATION_ID, operationId);
             mutableProps.put(OPERATION_NAME, operationName);
 
-            Map<String, Double> mutableMetrics = properties == null ? new HashMap<>() : new HashMap<>(metrics);
+            Map<String, Double> mutableMetrics = metrics == null ? new HashMap<>() : new HashMap<>(metrics);
             if (eventType == EventType.step) {
                 mutableMetrics.put(DURATION, Double.valueOf(System.currentTimeMillis() - timeStart));
             }
@@ -75,7 +75,7 @@ public synchronized void logError(ErrorType errorType, Throwable e, Map<String,
                 return;
             }
             Map<String, String> mutableProps = properties == null ? new HashMap<>() : new HashMap<>(properties);
-            Map<String, Double> mutableMetrics = properties == null ? new HashMap<>() : new HashMap<>(metrics);
+            Map<String, Double> mutableMetrics = metrics == null ? new HashMap<>() : new HashMap<>(metrics);
 
             error = new Error();
             error.errorType = errorType == null ? ErrorType.systemError : errorType;