Merge "Follow O patterns for a11y settings"