Two CP commits in a single PR. Original PRs: https://github.com/flutter/flutter/pull/131865 https://github.com/flutter/flutter/pull/132491