Merge "Restrict InputMethodManager @UnsupportedAppUsage on sInstance to <= VIC" into main