Merge "AccessibilityMenuServiceTest adjustment" into main