Adding text echo UI

Also fixing up discovery logic.

Change-Id: Ic30e3e0ab6d547850cd3b41504daef5edfa202fe
3 files changed