Merge "Added checks for AdapterView FOCUSABLE_AUTO compatibility" into oc-dev