Merge "Introduce per-user InputMethodSettings cache (2nd try)" into main