Merge "Change API name for a11y keyboard flag"