Merge "Strong pointer fixes in libinputservice" into main