Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev