Merge "Terminal should sustain the dialog when user touches the outside"