Merge integrate/meta-guf-machine/touchmodules-fix-parser-warning