Closes https://github.com/flutter/flutter/issues/141641, yay we done! --------- Co-authored-by: Zachary Anderson <zanderso@users.noreply.github.com>