Fixes: U4-4449 Issue: Discard Changes popup inconsistency