Add improved afk handling