Merge remote-tracking branch 'origin/master'

plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskDialog.java

@@ -95,7 +95,7 @@ public class CloseTaskDialog extends DialogWrapper {
   @Nullable
   @Override
   public JComponent getPreferredFocusedComponent() {
-    return myStateCombo.getComboBox();
+    return myStateCombo.isVisible() ? myStateCombo.getComboBox() : null;
   }
 
   @Nullable

plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java

@@ -274,9 +274,10 @@ public class OpenTaskDialog extends DialogWrapper {
     else if (myCreateChangelist.isSelected()) {
       return myChangelistName;
     }
-    else {
+    else if (myTaskStateCombo.isVisible()){
       return myTaskStateCombo.getComboBox();
     }
+    return null;
   }
 
   protected JComponent createCenterPanel() {