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

* commit '1cac53fa63060ec3fa3b0249b941ccf8544b3333':
  Fix accessibility state callbacks