Merge "Support A11y button on multi-display"