Merge "Allow dream to timeout in preview mode" into main