Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev