Merge "Fix bug in clearing a11y focus"