Set text in layout rather than programmatically

Bug: 32981714

Test: manual - follow steps to repro in the bug.
Change-Id: I47b9d3af8428a609948f4d300e8123d40eb751ef
3 files changed