Merge "Modifying the mechanism of A11y window cache"