Merge "Make a11y shortcut dialog themeable" into oc-mr1-dev