Merge "A11y: Better label status bar icons" into oc-dev