Session: Improve signal handling during device selection