Bug 1024863 - Safeguard against potential race condition r=lightsofapollo
Merge pull request #20474 from KevinGrandon/bug_1024863_vertical_safeguard

Bug 1024863 - Safeguard against potential race condition