Fixes https://github.com/flutter/flutter/issues/124174 Fixes https://github.com/flutter/flutter/issues/124980
