Merge "Fix ACCESSIBILITY_ENABLED settings." into nyc-dev