Merge "Fix problem with ListView accessibility focus"