am f8f88321: Merge "Turn on text display for debuggable builds"

* commit 'f8f8832179003ad0a4e9359ef16e2f49d9f38345':
  Turn on text display for debuggable builds