Merge "Fix accessibility state callbacks" into klp-dev