Merge "Dont stop external display connection session" into main