Merge "Fix A11yMenu's Settings page for edge-to-edge feature." into main