Merge "[VCN09] Rename linger timer"