Merge "Do not dismiss session ui if the close dialog reason is assist"