[TIMOB-10380] Added check to make sure there is an active window on update
[TIMOB-10380-3_0_X] Manual merge of 3_0_X
[TIMOB-10380] Manual merge of 3_0_X
Merge pull request #3683 from bryan-m-hughes/timob-10380-3_0_X

[TIMOB-10380] Added check to make sure there is an active window on update