[TIMOB-18175] Check if ViewController dismissal
Merge pull request #6468 from vishalduggal/timob-18175

[TIMOB-18175] Check if ViewController dismissal