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

Change-Id: If0a10fbf1b63e680d8fe3f0e9ff3844830a2da8a