Merge "Fix hub touch handling breaking after using gestures on hub over dream" into main