[TIMOB-16793] Subview index is not always reliable
Merge pull request #5577 from vishalduggal/timob-16793

[TIMOB-16793] Subview index is not always reliable