This was originally fixed in https://github.com/flutter/flutter/pull/119648, but was not created in tip of tree. This should be added to tip of tree with tests.