Merge "Fixed a a11y regression to click notifications" into oc-dev