Merge "Update accessibility compat classes for N." into nyc-dev