Merge pull request #98800 from ishpaul777/fix-travel-billing-lock-flicker-reopen