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

Change-Id: I581b2733c81177fd5297aca2d6a3e50a7c38384a