Merge "Use correct list index for search highlighting" into lmp-dev