Controls Ui - More string adjustments

More adjustments based on feedback

Bug: 151322044
Test: manual
Change-Id: I682f51ecafa8c8d800e89842f51f013a4d2bc883
4 files changed