Merge "Make AdapterView auto-focusable-aware" into oc-dev