Merge "End the TC session on terminal selection event actions" into pi-dev