Merge "A11yMenu Layout fixes" into main