Merge "Revert "Route dream touch handling to scene container"" into main