Merge "Minor resource cleanup for A11yMenu."