Hopefully fix trying to showing too many entries in TextListComponent.
Merge branch 'master' into unstable