[TIMOB-14964] (3_1_X) NavGroup Bug Fixes

Backport of PR #4615

Test is in [JIRA](https://jira.appcelerator.org/browse/TIMOB-14964)