Merge "Remove accessibility as an optional feature" into klp-modular-dev