Merge "Turn on text display for debuggable builds"