Merge "move raw idletimer ahead of clat"