DO NOT MERGE New back affordance small polish nits

Bug: 268405873
Test: Manual
Change-Id: I5f1ef578fc8acd78ceec77aeddd008ebaf252a5d
3 files changed