Merge "Fix problem with ListView accessibility focus" into oc-dev