Merge "Updated list selectors Bug: 5450396" into ics-mr0