Merge "Removed outdated TODO for LocaleList"