[TIMOB-12244] Ensure activeTab property is honored
Merge pull request #3673 from vishalduggal/timob-12244

[TIMOB-12244] Ensure activeTab property is honored