Merge "A11yMenuServiceTest cleanup & restructuring" into main