Merge "Fix input infos are inconsistent between WMS and InputFlinger (2/2)" into rvc-dev