Reland https://github.com/flutter/flutter/pull/133788.

Fixes https://github.com/flutter/flutter/issues/118830.
Fixes https://github.com/flutter/flutter/issues/125342.