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

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