Merge "Update a11y timeout UI"