Merge "Clear a11y cache on display addition"