Merge "Remove redundant call of queryInputMethodServicesInternal (2nd try)" into main