Merge "Clarify InputMethodSettings doesn't require ImfLock" into main