Merge "Terminal should sustain the dialog when user touches the outside" am: a7e7124a9e
am: 57dfec017a

Change-Id: I990ba06385f7a6cf5e6e7ed5c2ceac4a5871000d