Merge "Make a11y settings display consistent" into nyc-mr1-dev