am b1986354: am aad44178: Merge "Use transient state to preserve accessibility focus in ListView" into klp-dev

* commit 'b19863545ddf5f071926869d92aeb9aa38f2f857':
  Use transient state to preserve accessibility focus in ListView