Merge "Cleanup of deprecated A11y settings functions" into main