
Post-merge feedback from https://github.com/flutter/flutter/pull/160695. Feel free to suggest other (minor) changes, as the bulk of the work is already complete.
Post-merge feedback from https://github.com/flutter/flutter/pull/160695. Feel free to suggest other (minor) changes, as the bulk of the work is already complete.