am 80ec4ab7: Merge "Fix bug 5339708 - edge case in ListView focus restoration"

* commit '80ec4ab7f56646e464dbe6ff123703a178401b90':
  Fix bug 5339708 - edge case in ListView focus restoration