Merge "Eliminate race condition for a11y windows"