Merge "A11yMenuService unregisters displayListener" into main