Merge "Remember which list child has A11y focus BEFORE clearing A11y focus." into jb-mr2-dev