am 1e2b6438: Merge "Fix accessibility state callbacks" into klp-dev

* commit '1e2b64386f5d53415d547e06cc3c9040d8d506da':
  Fix accessibility state callbacks