[TIMOB-15188][TIMOB-15187] (3_1_X) TabGroup cleanup

Backport of PR #4690
Fixes 
[TIMOB-15188](https://jira.appcelerator.org/browse/TIMOB-15188)
[TIMOB-15187](https://jira.appcelerator.org/browse/TIMOB-15187)