chore: remove non-standard _EXTRA instances

[ericli3690]

Note

Assisted-by: Composer 2.5

Purpose / Description

While working on a PR for fixing up naming conventions, I found some extras that have EXTRA rather than a leading EXTRA in their name. It was annoying me, so here's a quick commit to fix it. I originally tried fully enforcing the leading EXTRA_ convention across all intent extras, but that got out of control really quickly, so here's a smaller incremental PR for now.

Fixes

• Part of discussion: Document & enforce naming conventions [layouts/standard variables] #19896

Approach

Simple renaming.

How Has This Been Tested?

App builds, unit tests pass.

Checklist

• You have a descriptive commit message with a short title (first line, max 50 chars).
• You have commented your code, particularly in hard-to-understand areas
• You have performed a self-review of your own code