Merge "Fix android:focusableInTouchMode support" into jb-dev