This should fix https://github.com/flutter/flutter/issues/31442 and https://github.com/flutter/flutter/issues/34867