SF: Clean up remaining display identifiers

Bug: 74619554
Test: Build
Change-Id: Icd8457b6496f02c6010c724cfa6ae678f6e01adf
9 files changed