Fixes for the TB demo application (#14910, #14911, #14912).

Change-Id: I40e469b338d07060590c3a8a3930c9dde56ba94f