Merge "Restore accessibility focus after ListView layout." into jb-mr1-dev