Have you tested this without applying the video patch?  It seems like this might be something we should land independently.  Should this patch go on v1-train, for example?