Merge "Support skipping a touch stream due to lack of handlers" into jb-dev