Added support to track last client to keep in focus while switching screens