Merge "Fix a11y window positions"