Fixes https://github.com/flutter/flutter/issues/137163 Fixes https://github.com/flutter/flutter/issues/139181
