Merge "Ensure EditorInfo#locales is set before return."