Merge "Actually log state transition timeouts in debug log"