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

Change-Id: I0a5bc55805089fc7ce3b28c3e857763cdae038a8