[CP] PR #54514 and #54537 onto the release branch#54556

auto-submit[bot] merged 2 commits into

flutter-team-archive:flutter-3.24-candidate.1flutter-team-archive/engine:flutter-3.24-candidate.1from

chingjun:cherrypick-2024-08chingjun/engine:cherrypick-2024-08Copy head branch name to clipboard