Merge "Fix thread leak from RttTextHandler" into pi-dev