Merge "Fix a11y crash when window layer isn't unique." into nyc-dev