Core: Updated touch support (5 testing)