Merge "Ensure that a11y window state change event is sent on focus change"