Merge "Fix event parsing" into android12-tests-dev