Merge "Fix potential advances overrun in TextLayoutCache."